Change in openvpn[master]: Static-challenge concatentation option
A message that is not in the archive (sent off-list or not yet received): gerrit.1718418288000.I59a90446bfe73d8856516025a58a6f62cc98ab0d@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
to review the following change.
Change subject: Static-challenge concatentation option
......................................................................
Static-challenge concatentation option
Extend "--static-challenge" option to take a third argument (=0 or 1) to specify that the password and response should be concatenated instead of using the SCRV1 protocol. If unspecified, it defaults to "0" meaning that the SCRV1 protocol should be used.
Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
---
M doc/man-sections/client-options.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/misc.c
M src/openvpn/misc.h
M src/openvpn/options.c
M src/openvpn/ssl.c
7 files changed, 63 insertions(+), 21 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/65/665/1
doc/man-sections/client-options.rst +5 -2
@@ -541,12 +541,15 @@ Valid syntax: :: - static-challenge text echo + static-challenge text echo [format] The ``text`` challenge text is presented to the user which describes what information is requested. The ``echo`` flag indicates if the user's input should be echoed on the screen. Valid ``echo`` values are - :code:`0` or :code:`1`. + :code:`0` or :code:`1`. The optional ``format`` flag indicates whether + the password and response should be combined using the SCRV1 protocol + (``format`` = :code: `0`) or simply concatenated (``format`` = :code: `1`). + :code: `0` is the default. See management-notes.txt in the OpenVPN distribution for a description of the OpenVPN challenge/response protocol.
doc/management-notes.txt +22 -6
@@ -1320,14 +1320,19 @@ OpenVPN's --static-challenge option is used to provide the challenge text to OpenVPN and indicate whether or not the response -should be echoed. +should be echoed and how the response should be combined with the +password. When credentials are needed and the --static-challenge option is used, the management interface will send: - >PASSWORD:Need 'Auth' username/password SC:<ECHO>,<TEXT> + >PASSWORD:Need 'Auth' username/password SC:<flags>,<TEXT> - ECHO: "1" if response should be echoed, "0" to not echo + flags: bitwise OR of ECHO and CONCAT flags + ECHO = 1 if response should be echoed, 0 to not echo + FORMAT = 1 if response should be concatenated with password + as plain text, 0 if response and password should be + encoded as described below TEXT: challenge text that should be shown to the user to facilitate their response
@@ -1342,8 +1347,8 @@ The management interface client in this case should add the static challenge text to the auth dialog followed by a field for the user to -enter a response. Then the management interface client should pack the -password and response together into an encoded password and send: +enter a response. If FORMAT=0, the management interface client should +pack the password and response together into an encoded password and send: username "Auth" <username> password "Auth" "SCRV1:<password_base64>:<response_base64>"
@@ -1354,6 +1359,12 @@ the user. The <password_base64> and/or the <response_base64> can be empty strings. +If FORMAT=1, the client should simply concatenate password and response +with no separator and send: + + username "Auth" <username> + password "Auth" "SCRV1:<password><response>" + (As in all username/password responses described in the "COMMAND -- password and username" section above, the username can be in quotes, and special characters such as double quotes or backslashes must be
@@ -1361,10 +1372,15 @@ For example, if user "foo" entered "bar" as the password and 8675309 as the PIN, the following management interface commands should be -issued: +issued if FROMAT = 0: username "Auth" foo password "Auth" "SCRV1:YmFy:ODY3NTMwOQ==" ("YmFy" is the base 64 encoding of "bar" and "ODY3NTMwOQ==" is the base 64 encoding of "8675309".) + +or, if FORMAT = 1: + + username "Auth" foo + password "Auth" "bar8675309"
src/openvpn/manage.c +2 -1
@@ -3544,7 +3544,8 @@if (sc) {buf_printf (&alert_msg," SC:%d,%s" , -BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ), +BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ) + |(BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT ) <<1 ), sc); }
src/openvpn/misc.c +20 -9
@@ -438,17 +438,28 @@ {msg (M_FATAL ,"ERROR: could not retrieve static challenge response" ); } -if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 - ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) +if (!(flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT )) { -msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); +if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 + ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) + { +msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); + } +buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); +buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); +string_clear (pw64); +free (pw64); +string_clear (resp64); +free (resp64); } -buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); -buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); -string_clear (pw64); -free (pw64); -string_clear (resp64); - free(resp64); +else + { +if (strlen (up->password) +strlen (response) >=USER_PASS_LEN ) + { +msg (M_FATAL ,"ERROR: could not concatenate password/static_response: string too long" ); + } +strncat (up->password, response,USER_PASS_LEN -strlen (up->password) -1 ); + } }#endif /* ifdef ENABLE_MANAGEMENT */ }
src/openvpn/misc.h +2 -0
@@ -91,6 +91,7 @@*/ struct static_challenge_info {#define SC_ECHO (1<<0)/* echo response when typed by user */ +#define SC_CONCAT (1<<1)/* concatenate password and response and do not base64 endode */ unsigned int flags;const char *challenge_text;
@@ -117,6 +118,7 @@#define GET_USER_PASS_STATIC_CHALLENGE_ECHO (1<<9)/* SCRV1 protocol -- echo response */ #define GET_USER_PASS_INLINE_CREDS (1<<10)/* indicates that auth_file is actually inline creds */ +#define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11)/* indicates password and response should be concatenated */ /** * Retrieves the user credentials from various sources depending on the flags.
src/openvpn/options.c +8 -3
@@ -518,8 +518,9 @@" Add domains to DNS domain search list\n" "--auth-retry t : How to handle auth failures. Set t to\n" " none (default), interact, or nointeract.\n" -"--static-challenge t e : Enable static challenge/response protocol using\n" -" challenge text t, with e indicating echo flag (0|1)\n" +"--static-challenge t e [p]: Enable static challenge/response protocol using\n" +" challenge text t, with f indicating echo flag (0|1)\n" +" p indicating SCRV1 protocol or concatenate response with password (0/1)\n" "--connect-timeout n : when polling possible remote servers to connect to\n" " in a round-robin fashion, spend no more than n seconds\n" " waiting for a response before trying the next server.\n"
@@ -7926,7 +7927,7 @@auth_retry_set (msglevel, p[1 ]); }#ifdef ENABLE_MANAGEMENT - else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[3]) + else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[4]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->sc_info.challenge_text = p[1 ];
@@ -7934,6 +7935,10 @@ { options->sc_info.flags |=SC_ECHO ; } +if (p[3 ] &&atoi (p[3 ])) + { + options->sc_info.flags |=SC_CONCAT ; + } }#endif else if (streq(p[0], "msg-channel") && p[1])
src/openvpn/ssl.c +4 -0
@@ -312,6 +312,10 @@ { flags |=GET_USER_PASS_STATIC_CHALLENGE_ECHO ; } +if (sci->flags &SC_CONCAT ) + { + flags |=GET_USER_PASS_STATIC_CHALLENGE_CONCAT ; + } get_user_pass_cr(&auth_user_pass, auth_file, UP_TYPE_AUTH,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 1
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, selvanair.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatentation option
......................................................................
Patch Set 1:
(1 comment)
File doc/man-sections/client-options.rst:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/87a2fe54_bda4864d :
PS1, Line 552: :code: 0 is the default.
I am not a big fan of this option but I will not block it. But I rather would see "scrv1" (as default) and "concat" as option for the configuration option rather than 0/1. The internal code can still use the flag but I feel 0/1 as option is rather clumsy.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 1
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: selvanair <[email protected]...>
Gerrit-Comment-Date: Tue, 18 Jun 2024 11:56:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: flichtenheld, selvanair.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
to look at the new patch set (#2).
Change subject: Static-challenge concatenation option
......................................................................
Static-challenge concatenation option
Extend "--static-challenge" option to take a third argument (= scrv1 or concat) to specify that the password and response should be concatenated instead of using the SCRV1 protocol. If unspecified, it defaults to "scrv1" meaning that the SCRV1 protocol should be used.
v2: use scrv1|concat instead of 0|1 as option argument
fix typos
Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
---
M doc/man-sections/client-options.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/misc.c
M src/openvpn/misc.h
M src/openvpn/options.c
M src/openvpn/ssl.c
7 files changed, 68 insertions(+), 20 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/65/665/2
doc/man-sections/client-options.rst +5 -2
@@ -541,12 +541,15 @@ Valid syntax: :: - static-challenge text echo + static-challenge text echo [format] The ``text`` challenge text is presented to the user which describes what information is requested. The ``echo`` flag indicates if the user's input should be echoed on the screen. Valid ``echo`` values are - :code:`0` or :code:`1`. + :code:`0` or :code:`1`. The optional ``format`` indicates whether + the password and response should be combined using the SCRV1 protocol + (``format`` = :code:`scrv1`) or simply concatenated (``format`` = :code:`concat`). + :code:`scrv1` is the default. See management-notes.txt in the OpenVPN distribution for a description of the OpenVPN challenge/response protocol.
doc/management-notes.txt +22 -6
@@ -1320,14 +1320,19 @@ OpenVPN's --static-challenge option is used to provide the challenge text to OpenVPN and indicate whether or not the response -should be echoed. +should be echoed and how the response should be combined with the +password. When credentials are needed and the --static-challenge option is used, the management interface will send: - >PASSWORD:Need 'Auth' username/password SC:<ECHO>,<TEXT> + >PASSWORD:Need 'Auth' username/password SC:<flags>,<TEXT> - ECHO: "1" if response should be echoed, "0" to not echo + flags: a bit field describing the ECHO and FORMAT flags + ECHO = bit 1 = 1 if response should be echoed, 0 to not echo + FORMAT = bit 2 = 1 if response should be concatenated with password + as plain text, 0 if response and password should be encoded + as described below TEXT: challenge text that should be shown to the user to facilitate their response
@@ -1342,8 +1347,8 @@ The management interface client in this case should add the static challenge text to the auth dialog followed by a field for the user to -enter a response. Then the management interface client should pack the -password and response together into an encoded password and send: +enter a response. If FORMAT=0, the management interface client should +pack the password and response together into an encoded password and send: username "Auth" <username> password "Auth" "SCRV1:<password_base64>:<response_base64>"
@@ -1354,6 +1359,12 @@ the user. The <password_base64> and/or the <response_base64> can be empty strings. +If FORMAT=1, the client should simply concatenate password and response +with no separator and send: + + username "Auth" <username> + password "Auth" "SCRV1:<password><response>" + (As in all username/password responses described in the "COMMAND -- password and username" section above, the username can be in quotes, and special characters such as double quotes or backslashes must be
@@ -1361,10 +1372,15 @@ For example, if user "foo" entered "bar" as the password and 8675309 as the PIN, the following management interface commands should be -issued: +issued if FORMAT = 0: username "Auth" foo password "Auth" "SCRV1:YmFy:ODY3NTMwOQ==" ("YmFy" is the base 64 encoding of "bar" and "ODY3NTMwOQ==" is the base 64 encoding of "8675309".) + +or, if FORMAT = 1: + + username "Auth" foo + password "Auth" "bar8675309"
src/openvpn/manage.c +2 -1
@@ -3544,7 +3544,8 @@if (sc) {buf_printf (&alert_msg," SC:%d,%s" , -BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ), +BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ) + |(BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT ) <<1 ), sc); }
src/openvpn/misc.c +20 -9
@@ -438,17 +438,28 @@ {msg (M_FATAL ,"ERROR: could not retrieve static challenge response" ); } -if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 - ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) +if (!(flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT )) { -msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); +if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 + ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) + { +msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); + } +buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); +buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); +string_clear (pw64); +free (pw64); +string_clear (resp64); +free (resp64); } -buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); -buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); -string_clear (pw64); -free (pw64); -string_clear (resp64); - free(resp64); +else + { +if (strlen (up->password) +strlen (response) >=USER_PASS_LEN ) + { +msg (M_FATAL ,"ERROR: could not concatenate password/static_response: string too long" ); + } +strncat (up->password, response,USER_PASS_LEN -strlen (up->password) -1 ); + } }#endif /* ifdef ENABLE_MANAGEMENT */ }
src/openvpn/misc.h +2 -0
@@ -91,6 +91,7 @@*/ struct static_challenge_info {#define SC_ECHO (1<<0)/* echo response when typed by user */ +#define SC_CONCAT (1<<1)/* concatenate password and response and do not base64 encode */ unsigned int flags;const char *challenge_text;
@@ -117,6 +118,7 @@#define GET_USER_PASS_STATIC_CHALLENGE_ECHO (1<<9)/* SCRV1 protocol -- echo response */ #define GET_USER_PASS_INLINE_CREDS (1<<10)/* indicates that auth_file is actually inline creds */ +#define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11)/* indicates password and response should be concatenated */ /** * Retrieves the user credentials from various sources depending on the flags.
src/openvpn/options.c +13 -2
@@ -518,8 +518,10 @@" Add domains to DNS domain search list\n" "--auth-retry t : How to handle auth failures. Set t to\n" " none (default), interact, or nointeract.\n" -"--static-challenge t e : Enable static challenge/response protocol using\n" +"--static-challenge t e [<scrv1|concat>]: Enable static challenge/response protocol using\n" " challenge text t, with e indicating echo flag (0|1)\n" +" and optional argument scrv1 or concat to use SCRV1 protocol or" +" concatenate response with password. Default is scrv1.\n" "--connect-timeout n : when polling possible remote servers to connect to\n" " in a round-robin fashion, spend no more than n seconds\n" " waiting for a response before trying the next server.\n"
@@ -7926,7 +7928,7 @@auth_retry_set (msglevel, p[1 ]); }#ifdef ENABLE_MANAGEMENT - else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[3]) + else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[4]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->sc_info.challenge_text = p[1 ];
@@ -7934,6 +7936,15 @@ { options->sc_info.flags |=SC_ECHO ; } +if (p[3 ] &&streq (p[3 ],"concat" )) + { + options->sc_info.flags |=SC_CONCAT ; + } +else if (p[3 ] && !streq (p[3 ],"scrv1" )) + { +msg (msglevel,"--static-challenge: unknown format indicator '%s'" , p[3 ]); + goto err; + } }#endif else if (streq(p[0], "msg-channel") && p[1])
src/openvpn/ssl.c +4 -0
@@ -312,6 +312,10 @@ { flags |=GET_USER_PASS_STATIC_CHALLENGE_ECHO ; } +if (sci->flags &SC_CONCAT ) + { + flags |=GET_USER_PASS_STATIC_CHALLENGE_CONCAT ; + } get_user_pass_cr(&auth_user_pass, auth_file, UP_TYPE_AUTH,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 2
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: selvanair <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
selvanair has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Patch Set 2:
(1 comment)
File doc/man-sections/client-options.rst:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/46ddef1b_f7400222 :
PS1, Line 552: :code: 0 is the default.
Quoted 1 line
I am not a big fan of this option but I will not block it. […]
I share that sentiment, but some GUI users want something like this. It feels better to have this defined in the core than invent it in the GUI.
Changed 0/1 to scrv1/concat.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 2
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 19 Jun 2024 01:56:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: plaisthos <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: plaisthos, selvanair.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Patch Set 2: Code-Review-1
(2 comments)
File doc/management-notes.txt:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/bf183267_3d352506 :
PS2, Line 1333: FORMAT = bit 2 = 1 if response should be concatenated with password
Honestly it is not clear to me from this documentation on how these flags combine. Concatenate them? Binary addition? Please include an example.
File src/openvpn/misc.h:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/49006d0b_8f0cea84 :
PS2, Line 121: #define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11) /* indicates password and response should be concatenated */ Please add a test to the UT suite test_get_user_pass_static_challenge
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 2
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: selvanair <[email protected]...>
Gerrit-Comment-Date: Tue, 09 Jul 2024 12:57:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
selvanair has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Patch Set 2:
(3 comments)
Patchset:
PS2:
Thanks for the review.
File doc/management-notes.txt:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/16c4a9ba_0d8e0e6a :
PS2, Line 1333: FORMAT = bit 2 = 1 if response should be concatenated with password
Quoted 1 line
Honestly it is not clear to me from this documentation on how these flags combine. […]
v2 is coming.
File src/openvpn/misc.h:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/25e712cb_3f39cbc9 :
PS2, Line 121: #define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11) /* indicates password and response should be concatenated */
Quoted 1 line
Please add a test to the UT suite
test_get_user_pass_static_challenge
Test was submitted along with: see https://gerrit.openvpn.net/c/openvpn/+/666
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 2
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 09 Jul 2024 13:22:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Static-challenge concatenation option
......................................................................
Static-challenge concatenation option
Extend "--static-challenge" option to take a third argument (= scrv1 or concat) to specify that the password and response should be concatenated instead of using the SCRV1 protocol. If unspecified, it defaults to "scrv1" meaning that the SCRV1 protocol should be used.
v2: use scrv1|concat instead of 0|1 as option argument
fix typos
v3: improve and correct documentation in management-notes.txt
Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
---
M doc/man-sections/client-options.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/misc.c
M src/openvpn/misc.h
M src/openvpn/options.c
M src/openvpn/ssl.c
7 files changed, 70 insertions(+), 20 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/65/665/3
doc/man-sections/client-options.rst +5 -2
@@ -541,12 +541,15 @@ Valid syntax: :: - static-challenge text echo + static-challenge text echo [format] The ``text`` challenge text is presented to the user which describes what information is requested. The ``echo`` flag indicates if the user's input should be echoed on the screen. Valid ``echo`` values are - :code:`0` or :code:`1`. + :code:`0` or :code:`1`. The optional ``format`` indicates whether + the password and response should be combined using the SCRV1 protocol + (``format`` = :code:`scrv1`) or simply concatenated (``format`` = :code:`concat`). + :code:`scrv1` is the default. See management-notes.txt in the OpenVPN distribution for a description of the OpenVPN challenge/response protocol.
doc/management-notes.txt +24 -6
@@ -1320,14 +1320,20 @@ OpenVPN's --static-challenge option is used to provide the challenge text to OpenVPN and indicate whether or not the response -should be echoed. +should be echoed and how the response should be combined with the +password. When credentials are needed and the --static-challenge option is used, the management interface will send: - >PASSWORD:Need 'Auth' username/password SC:<ECHO>,<TEXT> + >PASSWORD:Need 'Auth' username/password SC:<flag>,<TEXT> - ECHO: "1" if response should be echoed, "0" to not echo + flag: an integer whose least significant bit is the ECHO flag and + the next significant bit is the FORMAT flag. + ECHO = (flag & 0x1) is 1 if response should be echoed, 0 to not echo + FORMAT = (flag & 0x2) is 1 if response should be concatenated with + password as plain text, 0 if response and password should be encoded + as described below. Thus flag could take values 0, 1, 2, or 3. TEXT: challenge text that should be shown to the user to facilitate their response
@@ -1342,8 +1348,9 @@ The management interface client in this case should add the static challenge text to the auth dialog followed by a field for the user to -enter a response. Then the management interface client should pack the -password and response together into an encoded password and send: +enter a response. If flag = 0 or 1 (i.e., FORMAT=0), the management +interface client should pack the password and response together into +an encoded password and send: username "Auth" <username> password "Auth" "SCRV1:<password_base64>:<response_base64>"
@@ -1354,6 +1361,12 @@ the user. The <password_base64> and/or the <response_base64> can be empty strings. +If flag = 2 or 3 (i.e., FORMAT=1), the client should simply concatenate +password and response with no separator and send: + + username "Auth" <username> + password "Auth" "<password><response>" + (As in all username/password responses described in the "COMMAND -- password and username" section above, the username can be in quotes, and special characters such as double quotes or backslashes must be
@@ -1361,10 +1374,15 @@ For example, if user "foo" entered "bar" as the password and 8675309 as the PIN, the following management interface commands should be -issued: +issued if flag = 0 or 1 (i.e., FORMAT = 0): username "Auth" foo password "Auth" "SCRV1:YmFy:ODY3NTMwOQ==" ("YmFy" is the base 64 encoding of "bar" and "ODY3NTMwOQ==" is the base 64 encoding of "8675309".) + +or, if flag = 2 or 3 (i.e., FORMAT = 1): + + username "Auth" foo + password "Auth" "bar8675309"
src/openvpn/manage.c +2 -1
@@ -3544,7 +3544,8 @@if (sc) {buf_printf (&alert_msg," SC:%d,%s" , -BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ), +BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ) + |(BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT ) <<1 ), sc); }
src/openvpn/misc.c +20 -9
@@ -438,17 +438,28 @@ {msg (M_FATAL ,"ERROR: could not retrieve static challenge response" ); } -if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 - ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) +if (!(flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT )) { -msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); +if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 + ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) + { +msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); + } +buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); +buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); +string_clear (pw64); +free (pw64); +string_clear (resp64); +free (resp64); } -buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); -buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); -string_clear (pw64); -free (pw64); -string_clear (resp64); - free(resp64); +else + { +if (strlen (up->password) +strlen (response) >=USER_PASS_LEN ) + { +msg (M_FATAL ,"ERROR: could not concatenate password/static_response: string too long" ); + } +strncat (up->password, response,USER_PASS_LEN -strlen (up->password) -1 ); + } }#endif /* ifdef ENABLE_MANAGEMENT */ }
src/openvpn/misc.h +2 -0
@@ -91,6 +91,7 @@*/ struct static_challenge_info {#define SC_ECHO (1<<0)/* echo response when typed by user */ +#define SC_CONCAT (1<<1)/* concatenate password and response and do not base64 encode */ unsigned int flags;const char *challenge_text;
@@ -117,6 +118,7 @@#define GET_USER_PASS_STATIC_CHALLENGE_ECHO (1<<9)/* SCRV1 protocol -- echo response */ #define GET_USER_PASS_INLINE_CREDS (1<<10)/* indicates that auth_file is actually inline creds */ +#define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11)/* indicates password and response should be concatenated */ /** * Retrieves the user credentials from various sources depending on the flags.
src/openvpn/options.c +13 -2
@@ -518,8 +518,10 @@" Add domains to DNS domain search list\n" "--auth-retry t : How to handle auth failures. Set t to\n" " none (default), interact, or nointeract.\n" -"--static-challenge t e : Enable static challenge/response protocol using\n" +"--static-challenge t e [<scrv1|concat>]: Enable static challenge/response protocol using\n" " challenge text t, with e indicating echo flag (0|1)\n" +" and optional argument scrv1 or concat to use SCRV1 protocol or" +" concatenate response with password. Default is scrv1.\n" "--connect-timeout n : when polling possible remote servers to connect to\n" " in a round-robin fashion, spend no more than n seconds\n" " waiting for a response before trying the next server.\n"
@@ -7932,7 +7934,7 @@auth_retry_set (msglevel, p[1 ]); }#ifdef ENABLE_MANAGEMENT - else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[3]) + else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[4]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->sc_info.challenge_text = p[1 ];
@@ -7940,6 +7942,15 @@ { options->sc_info.flags |=SC_ECHO ; } +if (p[3 ] &&streq (p[3 ],"concat" )) + { + options->sc_info.flags |=SC_CONCAT ; + } +else if (p[3 ] && !streq (p[3 ],"scrv1" )) + { +msg (msglevel,"--static-challenge: unknown format indicator '%s'" , p[3 ]); + goto err; + } }#endif else if (streq(p[0], "msg-channel") && p[1])
src/openvpn/ssl.c +4 -0
@@ -312,6 +312,10 @@ { flags |=GET_USER_PASS_STATIC_CHALLENGE_ECHO ; } +if (sci->flags &SC_CONCAT ) + { + flags |=GET_USER_PASS_STATIC_CHALLENGE_CONCAT ; + } get_user_pass_cr(&auth_user_pass, auth_file, UP_TYPE_AUTH,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 3
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
selvanair has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Patch Set 3:
(2 comments)
File doc/management-notes.txt:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/3e068024_aebfdec6 :
PS2, Line 1333: FORMAT = bit 2 = 1 if response should be concatenated with password
Quoted 1 line
v2 is coming.
Done
File src/openvpn/misc.h:
http://gerrit.openvpn.net/c/openvpn/+/665/comment/c1296d70_31640ce7 :
PS2, Line 121: #define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11) /* indicates password and response should be concatenated */
Quoted 1 line
Test was submitted along with: see https://gerrit.openvpn. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 3
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 09 Jul 2024 21:40:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Comment-In-Reply-To: selvanair <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: plaisthos, selvanair.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 3
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: selvanair <[email protected]...>
Gerrit-Comment-Date: Wed, 10 Jul 2024 11:35:49 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: plaisthos.
selvanair has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
A bit confused about the gerrit workflow. The status says it's my turn now, but it seems one needs some special privilege to click "SUBMIT". Am I supposed to do a "git-send-email" the patch to the list at this point?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 3
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Wed, 10 Jul 2024 20:08:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archiveAttention is currently required from: plaisthos, selvanair.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
You *can* send it to the mailing list, if you want (using the dev-tools/gerrit-send-mail.py script to get the threading halfway right, and add the acked-by: headers according to the +2 in gerrit).
Usually Frank or I do this on behalf of the original submitter (because it's easy to do when the +2 comes by). I'm travelling so things take a bit longer.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 3
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: selvanair <[email protected]...>
Gerrit-Comment-Date: Wed, 10 Jul 2024 20:20:34 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
PATCH v3 1/1 Static-challenge concatenation option
In reply to a message not in the archiveFrom: Selva Nair <[email protected]...>
Extend "--static-challenge" option to take a third argument (= scrv1 or concat) to specify that the password and response should be concatenated instead of using the SCRV1 protocol. If unspecified, it defaults to "scrv1" meaning that the SCRV1 protocol should be used.
v2: use scrv1|concat instead of 0|1 as option argument
fix typos
v3: improve and correct documentation in management-notes.txt
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/665
This mail reflects revision 3 of this Change.
Signed-off-by line for the author was added as per our policy.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
doc/man-sections/client-options.rst +5 -2
@@ -541,12 +541,15 @@ Valid syntax: :: - static-challenge text echo + static-challenge text echo [format] The ``text`` challenge text is presented to the user which describes what information is requested. The ``echo`` flag indicates if the user's input should be echoed on the screen. Valid ``echo`` values are - :code:`0` or :code:`1`. + :code:`0` or :code:`1`. The optional ``format`` indicates whether + the password and response should be combined using the SCRV1 protocol + (``format`` = :code:`scrv1`) or simply concatenated (``format`` = :code:`concat`). + :code:`scrv1` is the default. See management-notes.txt in the OpenVPN distribution for a description of the OpenVPN challenge/response protocol.
doc/management-notes.txt +24 -6
@@ -1320,14 +1320,20 @@ OpenVPN's --static-challenge option is used to provide the challenge text to OpenVPN and indicate whether or not the response -should be echoed. +should be echoed and how the response should be combined with the +password. When credentials are needed and the --static-challenge option is used, the management interface will send: - >PASSWORD:Need 'Auth' username/password SC:<ECHO>,<TEXT> + >PASSWORD:Need 'Auth' username/password SC:<flag>,<TEXT> - ECHO: "1" if response should be echoed, "0" to not echo + flag: an integer whose least significant bit is the ECHO flag and + the next significant bit is the FORMAT flag. + ECHO = (flag & 0x1) is 1 if response should be echoed, 0 to not echo + FORMAT = (flag & 0x2) is 1 if response should be concatenated with + password as plain text, 0 if response and password should be encoded + as described below. Thus flag could take values 0, 1, 2, or 3. TEXT: challenge text that should be shown to the user to facilitate their response
@@ -1342,8 +1348,9 @@ The management interface client in this case should add the static challenge text to the auth dialog followed by a field for the user to -enter a response. Then the management interface client should pack the -password and response together into an encoded password and send: +enter a response. If flag = 0 or 1 (i.e., FORMAT=0), the management +interface client should pack the password and response together into +an encoded password and send: username "Auth" <username> password "Auth" "SCRV1:<password_base64>:<response_base64>"
@@ -1354,6 +1361,12 @@ the user. The <password_base64> and/or the <response_base64> can be empty strings. +If flag = 2 or 3 (i.e., FORMAT=1), the client should simply concatenate +password and response with no separator and send: + + username "Auth" <username> + password "Auth" "<password><response>" + (As in all username/password responses described in the "COMMAND -- password and username" section above, the username can be in quotes, and special characters such as double quotes or backslashes must be
@@ -1361,10 +1374,15 @@ For example, if user "foo" entered "bar" as the password and 8675309 as the PIN, the following management interface commands should be -issued: +issued if flag = 0 or 1 (i.e., FORMAT = 0): username "Auth" foo password "Auth" "SCRV1:YmFy:ODY3NTMwOQ==" ("YmFy" is the base 64 encoding of "bar" and "ODY3NTMwOQ==" is the base 64 encoding of "8675309".) + +or, if flag = 2 or 3 (i.e., FORMAT = 1): + + username "Auth" foo + password "Auth" "bar8675309"
src/openvpn/manage.c +2 -1
@@ -3544,7 +3544,8 @@if (sc) {buf_printf (&alert_msg," SC:%d,%s" , -BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ), +BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ) + |(BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT ) <<1 ), sc); }
src/openvpn/misc.c +20 -9
@@ -438,17 +438,28 @@ {msg (M_FATAL ,"ERROR: could not retrieve static challenge response" ); } -if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 - ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) +if (!(flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT )) { -msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); +if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 + ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) + { +msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); + } +buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); +buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); +string_clear (pw64); +free (pw64); +string_clear (resp64); +free (resp64); } -buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); -buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); -string_clear (pw64); -free (pw64); -string_clear (resp64); - free(resp64); +else + { +if (strlen (up->password) +strlen (response) >=USER_PASS_LEN ) + { +msg (M_FATAL ,"ERROR: could not concatenate password/static_response: string too long" ); + } +strncat (up->password, response,USER_PASS_LEN -strlen (up->password) -1 ); + } }#endif /* ifdef ENABLE_MANAGEMENT */ }
src/openvpn/misc.h +2 -0
@@ -91,6 +91,7 @@*/ struct static_challenge_info {#define SC_ECHO (1<<0)/* echo response when typed by user */ +#define SC_CONCAT (1<<1)/* concatenate password and response and do not base64 encode */ unsigned int flags;const char *challenge_text;
@@ -117,6 +118,7 @@#define GET_USER_PASS_STATIC_CHALLENGE_ECHO (1<<9)/* SCRV1 protocol -- echo response */ #define GET_USER_PASS_INLINE_CREDS (1<<10)/* indicates that auth_file is actually inline creds */ +#define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11)/* indicates password and response should be concatenated */ /** * Retrieves the user credentials from various sources depending on the flags.
src/openvpn/options.c +13 -2
@@ -518,8 +518,10 @@" Add domains to DNS domain search list\n" "--auth-retry t : How to handle auth failures. Set t to\n" " none (default), interact, or nointeract.\n" -"--static-challenge t e : Enable static challenge/response protocol using\n" +"--static-challenge t e [<scrv1|concat>]: Enable static challenge/response protocol using\n" " challenge text t, with e indicating echo flag (0|1)\n" +" and optional argument scrv1 or concat to use SCRV1 protocol or" +" concatenate response with password. Default is scrv1.\n" "--connect-timeout n : when polling possible remote servers to connect to\n" " in a round-robin fashion, spend no more than n seconds\n" " waiting for a response before trying the next server.\n"
@@ -7932,7 +7934,7 @@auth_retry_set (msglevel, p[1 ]); }#ifdef ENABLE_MANAGEMENT - else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[3]) + else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[4]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->sc_info.challenge_text = p[1 ];
@@ -7940,6 +7942,15 @@ { options->sc_info.flags |=SC_ECHO ; } +if (p[3 ] &&streq (p[3 ],"concat" )) + { + options->sc_info.flags |=SC_CONCAT ; + } +else if (p[3 ] && !streq (p[3 ],"scrv1" )) + { +msg (msglevel,"--static-challenge: unknown format indicator '%s'" , p[3 ]); + goto err; + } }#endif else if (streq(p[0], "msg-channel") && p[1])
src/openvpn/ssl.c +4 -0
@@ -312,6 +312,10 @@ { flags |=GET_USER_PASS_STATIC_CHALLENGE_ECHO ; } +if (sci->flags &SC_CONCAT ) + { + flags |=GET_USER_PASS_STATIC_CHALLENGE_CONCAT ; + } get_user_pass_cr(&auth_user_pass, auth_file, UP_TYPE_AUTH,
[Openvpn-devel] [PATCH applied] Re: Static-challenge concatenation option
Thanks for your patience, and sorry for taking so long... vacation and other excuses.
Haven't actually tested for good (a --static-challenge setup is on my TODO list since like 100 years...), but the code looks reasonable, it passes all "non-challenge" tests, and has an ACK from Frank :-) - and a few basic tests with "run client from cli, look what plugin-auth-pam reports on the other end" confirm that it does the job.
Is the GUI support already committed? I seem to remember seeing a PR for that "weeks ago"... and someone needs to bring Tunnelblick on board.
Your patch has been applied to the master branch.
commit 6f6a0f362f845f042a965f797b731f8931310372 (master)
Author: Selva Nair Date: Fri Jul 19 15:14:07 2024 +0200
Static-challenge concatenation option
Signed-off-by: Selva Nair <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28943.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Re: [Openvpn-devel] [PATCH applied] Re: Static-challenge concatenation option
Quoted 4 lines
Is the GUI support already committed? I seem to remember seeing a PR for that "weeks ago"... and someone needs to bring Tunnelblick on board.
GUI patch is still in a private branch -- will submit a PR soon.
I've sent a note to Jon about the change.
Selva
Re: [Openvpn-devel] [PATCH applied] Re: Static-challenge concatenation option
Hi,
Quoted 4 lines · Selva Nair
Quoted 2 lines
Is the GUI support already committed? I seem to remember seeing a PR for that "weeks ago"... and someone needs to bring Tunnelblick on board.
I've sent a note to Jon about the change.
Thanks :-)
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Re: [Openvpn-devel] [PATCH applied] Re: Static-challenge concatenation option
Hi,
Quoted 8 lines · Gert Doering
Hi,
Quoted 4 lines · Selva Nair
Quoted 2 lines
Is the GUI support already committed? I seem to remember seeing a PR for that "weeks ago"... and someone needs to bring Tunnelblick on board.
I've sent a note to Jon about the change.
The heads-up was much appreciated, Selva.
Tunnelblick has had a mechanism to concatenate the response to the user's password for about six years. (How the time flies!) I've made changes so Tunnelblick can use the new OpenVPN mechanism, too. The changes will be included in the next Tunnelblick beta release.
While working on this, I was able to streamline the Tunnelblick user experience for challenge/response, so thanks, Selva, for inspiring that!
Please note that I **did not** test the proposed patch. Instead, I simulated OpenVPN sending
PASSWORD:Need 'Auth' username/password SC:<flag>,<prompt>
through the management interface to Tunnelblick.
Best to all,
Jon
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archivecron2 has uploaded a new patch set (#4) to the change originally created by selvanair. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld
Change subject: Static-challenge concatenation option
......................................................................
Static-challenge concatenation option
Extend "--static-challenge" option to take a third argument (= scrv1 or concat) to specify that the password and response should be concatenated instead of using the SCRV1 protocol. If unspecified, it defaults to "scrv1" meaning that the SCRV1 protocol should be used.
v2: use scrv1|concat instead of 0|1 as option argument
fix typos
v3: improve and correct documentation in management-notes.txt
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28943.html
---
M doc/man-sections/client-options.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/misc.c
M src/openvpn/misc.h
M src/openvpn/options.c
M src/openvpn/ssl.c
7 files changed, 70 insertions(+), 20 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/65/665/4
doc/man-sections/client-options.rst +5 -2
@@ -541,12 +541,15 @@ Valid syntax: :: - static-challenge text echo + static-challenge text echo [format] The ``text`` challenge text is presented to the user which describes what information is requested. The ``echo`` flag indicates if the user's input should be echoed on the screen. Valid ``echo`` values are - :code:`0` or :code:`1`. + :code:`0` or :code:`1`. The optional ``format`` indicates whether + the password and response should be combined using the SCRV1 protocol + (``format`` = :code:`scrv1`) or simply concatenated (``format`` = :code:`concat`). + :code:`scrv1` is the default. See management-notes.txt in the OpenVPN distribution for a description of the OpenVPN challenge/response protocol.
doc/management-notes.txt +24 -6
@@ -1320,14 +1320,20 @@ OpenVPN's --static-challenge option is used to provide the challenge text to OpenVPN and indicate whether or not the response -should be echoed. +should be echoed and how the response should be combined with the +password. When credentials are needed and the --static-challenge option is used, the management interface will send: - >PASSWORD:Need 'Auth' username/password SC:<ECHO>,<TEXT> + >PASSWORD:Need 'Auth' username/password SC:<flag>,<TEXT> - ECHO: "1" if response should be echoed, "0" to not echo + flag: an integer whose least significant bit is the ECHO flag and + the next significant bit is the FORMAT flag. + ECHO = (flag & 0x1) is 1 if response should be echoed, 0 to not echo + FORMAT = (flag & 0x2) is 1 if response should be concatenated with + password as plain text, 0 if response and password should be encoded + as described below. Thus flag could take values 0, 1, 2, or 3. TEXT: challenge text that should be shown to the user to facilitate their response
@@ -1342,8 +1348,9 @@ The management interface client in this case should add the static challenge text to the auth dialog followed by a field for the user to -enter a response. Then the management interface client should pack the -password and response together into an encoded password and send: +enter a response. If flag = 0 or 1 (i.e., FORMAT=0), the management +interface client should pack the password and response together into +an encoded password and send: username "Auth" <username> password "Auth" "SCRV1:<password_base64>:<response_base64>"
@@ -1354,6 +1361,12 @@ the user. The <password_base64> and/or the <response_base64> can be empty strings. +If flag = 2 or 3 (i.e., FORMAT=1), the client should simply concatenate +password and response with no separator and send: + + username "Auth" <username> + password "Auth" "<password><response>" + (As in all username/password responses described in the "COMMAND -- password and username" section above, the username can be in quotes, and special characters such as double quotes or backslashes must be
@@ -1361,10 +1374,15 @@ For example, if user "foo" entered "bar" as the password and 8675309 as the PIN, the following management interface commands should be -issued: +issued if flag = 0 or 1 (i.e., FORMAT = 0): username "Auth" foo password "Auth" "SCRV1:YmFy:ODY3NTMwOQ==" ("YmFy" is the base 64 encoding of "bar" and "ODY3NTMwOQ==" is the base 64 encoding of "8675309".) + +or, if flag = 2 or 3 (i.e., FORMAT = 1): + + username "Auth" foo + password "Auth" "bar8675309"
src/openvpn/manage.c +2 -1
@@ -3544,7 +3544,8 @@if (sc) {buf_printf (&alert_msg," SC:%d,%s" , -BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ), +BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ) + |(BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT ) <<1 ), sc); }
src/openvpn/misc.c +20 -9
@@ -439,17 +439,28 @@ {msg (M_FATAL ,"ERROR: could not retrieve static challenge response" ); } -if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 - ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) +if (!(flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT )) { -msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); +if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 + ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) + { +msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); + } +buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); +buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); +string_clear (pw64); +free (pw64); +string_clear (resp64); +free (resp64); } -buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); -buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); -string_clear (pw64); -free (pw64); -string_clear (resp64); - free(resp64); +else + { +if (strlen (up->password) +strlen (response) >=USER_PASS_LEN ) + { +msg (M_FATAL ,"ERROR: could not concatenate password/static_response: string too long" ); + } +strncat (up->password, response,USER_PASS_LEN -strlen (up->password) -1 ); + } }#endif /* ifdef ENABLE_MANAGEMENT */ }
src/openvpn/misc.h +2 -0
@@ -92,6 +92,7 @@*/ struct static_challenge_info {#define SC_ECHO (1<<0)/* echo response when typed by user */ +#define SC_CONCAT (1<<1)/* concatenate password and response and do not base64 encode */ unsigned int flags;const char *challenge_text;
@@ -118,6 +119,7 @@#define GET_USER_PASS_STATIC_CHALLENGE_ECHO (1<<9)/* SCRV1 protocol -- echo response */ #define GET_USER_PASS_INLINE_CREDS (1<<10)/* indicates that auth_file is actually inline creds */ +#define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11)/* indicates password and response should be concatenated */ /** * Retrieves the user credentials from various sources depending on the flags.
src/openvpn/options.c +13 -2
@@ -518,8 +518,10 @@" Add domains to DNS domain search list\n" "--auth-retry t : How to handle auth failures. Set t to\n" " none (default), interact, or nointeract.\n" -"--static-challenge t e : Enable static challenge/response protocol using\n" +"--static-challenge t e [<scrv1|concat>]: Enable static challenge/response protocol using\n" " challenge text t, with e indicating echo flag (0|1)\n" +" and optional argument scrv1 or concat to use SCRV1 protocol or" +" concatenate response with password. Default is scrv1.\n" "--connect-timeout n : when polling possible remote servers to connect to\n" " in a round-robin fashion, spend no more than n seconds\n" " waiting for a response before trying the next server.\n"
@@ -7948,7 +7950,7 @@auth_retry_set (msglevel, p[1 ]); }#ifdef ENABLE_MANAGEMENT - else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[3]) + else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[4]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->sc_info.challenge_text = p[1 ];
@@ -7956,6 +7958,15 @@ { options->sc_info.flags |=SC_ECHO ; } +if (p[3 ] &&streq (p[3 ],"concat" )) + { + options->sc_info.flags |=SC_CONCAT ; + } +else if (p[3 ] && !streq (p[3 ],"scrv1" )) + { +msg (msglevel,"--static-challenge: unknown format indicator '%s'" , p[3 ]); + goto err; + } }#endif else if (streq(p[0], "msg-channel") && p[1])
src/openvpn/ssl.c +4 -0
@@ -315,6 +315,10 @@ { flags |=GET_USER_PASS_STATIC_CHALLENGE_ECHO ; } +if (sci->flags &SC_CONCAT ) + { + flags |=GET_USER_PASS_STATIC_CHALLENGE_CONCAT ; + } get_user_pass_cr(&auth_user_pass, auth_file, UP_TYPE_AUTH,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 4
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Static-challenge concatenation option
In reply to a message not in the archivecron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/665?usp=email )
Change subject: Static-challenge concatenation option
......................................................................
Static-challenge concatenation option
Extend "--static-challenge" option to take a third argument (= scrv1 or concat) to specify that the password and response should be concatenated instead of using the SCRV1 protocol. If unspecified, it defaults to "scrv1" meaning that the SCRV1 protocol should be used.
v2: use scrv1|concat instead of 0|1 as option argument
fix typos
v3: improve and correct documentation in management-notes.txt
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28943.html
---
M doc/man-sections/client-options.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/misc.c
M src/openvpn/misc.h
M src/openvpn/options.c
M src/openvpn/ssl.c
7 files changed, 70 insertions(+), 20 deletions(-)
doc/man-sections/client-options.rst +5 -2
@@ -541,12 +541,15 @@ Valid syntax: :: - static-challenge text echo + static-challenge text echo [format] The ``text`` challenge text is presented to the user which describes what information is requested. The ``echo`` flag indicates if the user's input should be echoed on the screen. Valid ``echo`` values are - :code:`0` or :code:`1`. + :code:`0` or :code:`1`. The optional ``format`` indicates whether + the password and response should be combined using the SCRV1 protocol + (``format`` = :code:`scrv1`) or simply concatenated (``format`` = :code:`concat`). + :code:`scrv1` is the default. See management-notes.txt in the OpenVPN distribution for a description of the OpenVPN challenge/response protocol.
doc/management-notes.txt +24 -6
@@ -1320,14 +1320,20 @@ OpenVPN's --static-challenge option is used to provide the challenge text to OpenVPN and indicate whether or not the response -should be echoed. +should be echoed and how the response should be combined with the +password. When credentials are needed and the --static-challenge option is used, the management interface will send: - >PASSWORD:Need 'Auth' username/password SC:<ECHO>,<TEXT> + >PASSWORD:Need 'Auth' username/password SC:<flag>,<TEXT> - ECHO: "1" if response should be echoed, "0" to not echo + flag: an integer whose least significant bit is the ECHO flag and + the next significant bit is the FORMAT flag. + ECHO = (flag & 0x1) is 1 if response should be echoed, 0 to not echo + FORMAT = (flag & 0x2) is 1 if response should be concatenated with + password as plain text, 0 if response and password should be encoded + as described below. Thus flag could take values 0, 1, 2, or 3. TEXT: challenge text that should be shown to the user to facilitate their response
@@ -1342,8 +1348,9 @@ The management interface client in this case should add the static challenge text to the auth dialog followed by a field for the user to -enter a response. Then the management interface client should pack the -password and response together into an encoded password and send: +enter a response. If flag = 0 or 1 (i.e., FORMAT=0), the management +interface client should pack the password and response together into +an encoded password and send: username "Auth" <username> password "Auth" "SCRV1:<password_base64>:<response_base64>"
@@ -1354,6 +1361,12 @@ the user. The <password_base64> and/or the <response_base64> can be empty strings. +If flag = 2 or 3 (i.e., FORMAT=1), the client should simply concatenate +password and response with no separator and send: + + username "Auth" <username> + password "Auth" "<password><response>" + (As in all username/password responses described in the "COMMAND -- password and username" section above, the username can be in quotes, and special characters such as double quotes or backslashes must be
@@ -1361,10 +1374,15 @@ For example, if user "foo" entered "bar" as the password and 8675309 as the PIN, the following management interface commands should be -issued: +issued if flag = 0 or 1 (i.e., FORMAT = 0): username "Auth" foo password "Auth" "SCRV1:YmFy:ODY3NTMwOQ==" ("YmFy" is the base 64 encoding of "bar" and "ODY3NTMwOQ==" is the base 64 encoding of "8675309".) + +or, if flag = 2 or 3 (i.e., FORMAT = 1): + + username "Auth" foo + password "Auth" "bar8675309"
src/openvpn/manage.c +2 -1
@@ -3544,7 +3544,8 @@if (sc) {buf_printf (&alert_msg," SC:%d,%s" , -BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ), +BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_ECHO ) + |(BOOL_CAST (flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT ) <<1 ), sc); }
src/openvpn/misc.c +20 -9
@@ -439,17 +439,28 @@ {msg (M_FATAL ,"ERROR: could not retrieve static challenge response" ); } -if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 - ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) +if (!(flags &GET_USER_PASS_STATIC_CHALLENGE_CONCAT )) { -msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); +if (openvpn_base64_encode (up->password,strlen (up->password), &pw64) ==-1 + ||openvpn_base64_encode (response,strlen (response), &resp64) ==-1 ) + { +msg (M_FATAL ,"ERROR: could not base64-encode password/static_response" ); + } +buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); +buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); +string_clear (pw64); +free (pw64); +string_clear (resp64); +free (resp64); } -buf_set_write (&packed_resp, (uint8_t *)up->password,USER_PASS_LEN ); -buf_printf (&packed_resp,"SCRV1:%s:%s" , pw64, resp64); -string_clear (pw64); -free (pw64); -string_clear (resp64); - free(resp64); +else + { +if (strlen (up->password) +strlen (response) >=USER_PASS_LEN ) + { +msg (M_FATAL ,"ERROR: could not concatenate password/static_response: string too long" ); + } +strncat (up->password, response,USER_PASS_LEN -strlen (up->password) -1 ); + } }#endif /* ifdef ENABLE_MANAGEMENT */ }
src/openvpn/misc.h +2 -0
@@ -92,6 +92,7 @@*/ struct static_challenge_info {#define SC_ECHO (1<<0)/* echo response when typed by user */ +#define SC_CONCAT (1<<1)/* concatenate password and response and do not base64 encode */ unsigned int flags;const char *challenge_text;
@@ -118,6 +119,7 @@#define GET_USER_PASS_STATIC_CHALLENGE_ECHO (1<<9)/* SCRV1 protocol -- echo response */ #define GET_USER_PASS_INLINE_CREDS (1<<10)/* indicates that auth_file is actually inline creds */ +#define GET_USER_PASS_STATIC_CHALLENGE_CONCAT (1<<11)/* indicates password and response should be concatenated */ /** * Retrieves the user credentials from various sources depending on the flags.
src/openvpn/options.c +13 -2
@@ -518,8 +518,10 @@" Add domains to DNS domain search list\n" "--auth-retry t : How to handle auth failures. Set t to\n" " none (default), interact, or nointeract.\n" -"--static-challenge t e : Enable static challenge/response protocol using\n" +"--static-challenge t e [<scrv1|concat>]: Enable static challenge/response protocol using\n" " challenge text t, with e indicating echo flag (0|1)\n" +" and optional argument scrv1 or concat to use SCRV1 protocol or" +" concatenate response with password. Default is scrv1.\n" "--connect-timeout n : when polling possible remote servers to connect to\n" " in a round-robin fashion, spend no more than n seconds\n" " waiting for a response before trying the next server.\n"
@@ -7948,7 +7950,7 @@auth_retry_set (msglevel, p[1 ]); }#ifdef ENABLE_MANAGEMENT - else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[3]) + else if (streq(p[0], "static-challenge") && p[1] && p[2] && !p[4]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->sc_info.challenge_text = p[1 ];
@@ -7956,6 +7958,15 @@ { options->sc_info.flags |=SC_ECHO ; } +if (p[3 ] &&streq (p[3 ],"concat" )) + { + options->sc_info.flags |=SC_CONCAT ; + } +else if (p[3 ] && !streq (p[3 ],"scrv1" )) + { +msg (msglevel,"--static-challenge: unknown format indicator '%s'" , p[3 ]); + goto err; + } }#endif else if (streq(p[0], "msg-channel") && p[1])
src/openvpn/ssl.c +4 -0
@@ -315,6 +315,10 @@ { flags |=GET_USER_PASS_STATIC_CHALLENGE_ECHO ; } +if (sci->flags &SC_CONCAT ) + { + flags |=GET_USER_PASS_STATIC_CHALLENGE_CONCAT ; + } get_user_pass_cr(&auth_user_pass, auth_file, UP_TYPE_AUTH,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/665?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I59a90446bfe73d8856516025a58a6f62cc98ab0d
Gerrit-Change-Number: 665
Gerrit-PatchSet: 4
Gerrit-Owner: selvanair <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged